SparkN0de-git - /page/commit.mu

Micron Document

--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

| SparkN0de-git | SparkN0de |

Node / ReticulumProjects / LXMF.git / commits / a461fd4

Commit a461fd415afcf80ff15c2a1d1cbd61bb5ccf6d04

󰉖 Browse tree at this commit

Parents : ef1c333

Author : Mark Qvist <mark@unsigned.io>

Date : 2024-09-19T23:00:24+02:00

Rediscover path during opportunistic delivery if path fails

Changes

1 files changed, 7 insertions(+), 3 deletions(-)

M LXMF/LXMRouter.py +7 -3

Diff

diff --git a/LXMF/LXMRouter.py b/LXMF/LXMRouter.py

index 34cfbc8..e3480cb 100644

--- a/LXMF/LXMRouter.py

+++ b/LXMF/LXMRouter.py

@@ -1805,10 +1805,14 @@ class LXMRouter:

RNS.Transport.request_path(lxmessage.get_destination().hash)

lxmessage.next_delivery_attempt = time.time() + LXMRouter.PATH_REQUEST_WAIT

lxmessage.progress = 0.00

- elif lxmessage.delivery_attempts == LXMRouter.MAX_PATHLESS_TRIES+3 and RNS.Transport.has_path(lxmessage.get_destination().hash):

- RNS.log(f"Opportunistic delivery for {lxmessage} still unsuccessful after {lxmessage.delivery_attempts} attempts, trying to update path to {RNS.prettyhexrep(lxmessage.get_destination().hash)}", RNS.LOG_DEBUG)

+ elif lxmessage.delivery_attempts == LXMRouter.MAX_PATHLESS_TRIES+1 and RNS.Transport.has_path(lxmessage.get_destination().hash):

+ RNS.log(f"Opportunistic delivery for {lxmessage} still unsuccessful after {lxmessage.delivery_attempts} attempts, trying to rediscover path to {RNS.prettyhexrep(lxmessage.get_destination().hash)}", RNS.LOG_DEBUG)

lxmessage.delivery_attempts += 1

- RNS.Transport.request_path(lxmessage.get_destination().hash)

+ RNS.Reticulum.get_instance().drop_path(lxmessage.get_destination().hash)

+ def rediscover_job():

+ time.sleep(0.5)

+ RNS.Transport.request_path(lxmessage.get_destination().hash)

+ threading.Thread(target=rediscover_job, daemon=True).start()

lxmessage.next_delivery_attempt = time.time() + LXMRouter.PATH_REQUEST_WAIT

lxmessage.progress = 0.00

else:

──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────